//
//  ViewController.m
//  skyer1
//
//  Created by SoKing on 2018/5/4.
//  Copyright © 2018年 skyer. All rights reserved.
//

#import "ViewController.h"

@interface ViewController ()

@end

@implementation ViewController

- (void)viewDidLoad {
    [super viewDidLoad];
    // Do any additional setup after loading the view, typically from a nib.
    NSLog(@"我就试试效果");
    [self addMethod];
}


- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
}
-(void)addMethod{
    NSLog(@"一个方法合并给主分支");
}

@end
